merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 20 Sep 2011 04:39:47 +0000 (13:39 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 20 Sep 2011 04:39:47 +0000 (13:39 +0900)

Trivial merge